Auto merge of #1111 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 31 Dec 2014 21:39:41 +0000 (21:39 +0000)
committerbors <bors@rust-lang.org>
Wed, 31 Dec 2014 21:39:41 +0000 (21:39 +0000)

Trivial merge